Various QOL improvements and cleanup