fix defaults
a few more fixes