All sorts of small feature changes / tests