Fixed several small bugs/annoyances