bug fixes and modifying GUI even more