fixcommit

added new features and bugs