tests review
code and test fixes
docs added
controller updates
controller updates