Big cleanups

As discussed via email, this greatly improves my kalibrate "experience"