various fixes, testing continuing