removed bzero and other fixes