merge TechIsFun modifications