Minor Adjustments & Bug Fixing