A few additions and a bit of cleanup