fixes, updates, tests