Some corrections and optimized instructions