fixes
base working commit