fixes + adjustments