Things

Three bug fixes