fixes + add other things