Cleanups (and more testing)
apply more changes