Minor bugs have been fixed