Minor updates

Minor Updates and Fixes