Huge bunch of changes and cleanups