Updates and Fixes

Fixes to last commit.