Fixed more consistency things, still running tests, overhauled the UI sligthly...