Fixes and Minor Updates