Small bug fixes and changed some things cause of OCD.
Merge pull request #114 from Clashnia/bugfix

Small bug fixes and changed some things cause of OCD.