Quaternions
various cleanups