Minor Changes

The usual bug fixes better improvement  blah~!