Cleaned up warning messages. Gui changes. Bug fixes