Minor Changes

New Feature
Few bugs