Pull request for fixes and updates

Commits described within themselves