added more comments stuff
fixed bug