Minor Changes/Bug Fixes