work on #578
check in common refactor Still a mess
lang fixes