another round of changes, some fixes