Continued Updates Before Refactoring

Fixing a few issues