Fixing a lie
Various bugfixes and UI enhancement