more fixes, updates
more stuff