Bug Fixes + Formatting