typo fixed
minor bugs fixed
minor bugs fixed