More Minor Changes

Tweeks and fix to a method