changed some stuff, rmoved comments