update for style
with rake, and some ncleanup
merging branches into master. thats all