Minor Fixes

Minor Fixes to make it smoother