A kinetic Monte Carlo model with improved charge injection model for the photocurrent characteristics of organic solar cells