- minor bugs fixed