bug fixes before class