Minor Fixes and some documentation