some updates: master
started refactoring code: master