Some bugs have been fixed