Bug Fixes + Further Improvements