Small updates and a bit of cleanup