Bug Fixes

Working out kinks in the codebase before moving forward.