updates
more changes and a bit of cleanup