Fixed some minor bugs and annoyances