fixed some annoyances