fixed some minor bugs and annoyances