Clean-ups and sanity checks

UI hints are still needed