multiple fixes + changes