Fixed minor bugs. I hope it's last patch. Thank you!