Updated classpath and minor changes
Pull changes fixed