ift code update
a fair amount of small updates to files to make them work better