General Throweraterenator testing and minor changes.