Various cleanup and rework of ft methods