minor fixes and bugtesting things