fixed some stuff with comments