Fixed some bugs

Fixed some bugs.
Thanks to pooiloui, his/her post pointed to a bug.
Your advice is important to me.
Later updates may be slower because I'm studying at university, excuse me plz.
Have a good day!