Cleaned up the code, improved some displays