Fixes, performance improvements, code style changes, and generally fix everything else IntelliJ said was bad