Cleaned up some minor bugs/features.