all minor bugs fixed