Minor Changes

Minor updates and bug fixes