fixes
More goodies