little bugs fixed + comments extended