many fixes

This commit should run.