Did a bunch of stuff. Cleaned up errors, made things work better together.