added few bugs
 added comments lol