fix bugs / updates
update tests