Made some adjustments

I tried to keep these changes fairly atomic, so hopefully you can keep what you like and leave what you don't.