-polishing code

-add new features