fixes, updates, cleanup