#17 minor bugs fixed