rewriting
some updates
README updates
cleanup
merge dev into master