misc updates
lots of updates that should have been pushed sooner