version bump
fomatting and more cleanup