Some minor bugs have been fixed