Various changes and a bit of cleanup