misc fixes, testing...