Allow pre-filling with free tagging. Also neaten some stuff