time 22:54 - fixed that bug and other stuff