* minor bugs fixed