Various Fixes and Formats and Readd in GUI