Various changes, no idea what I was doing on this project.