fixxes
clean up
adjustments