Small bug fixes and changed some things cause of OCD.