Warning cleanup
Rename the Text-based monitors
Formatting and cleaner imports
Imports
More import cleanup