Fix all the lowercase stuff, merge issues, etc.

Well, this was certainly a learning experience.