small misc changes
small misc changes
a little more cleanup
going to fave02 before making structural changes