Minor Changes & Bugfix