Better templates
Minor Makefile changes
Split some math
I'm not sure what this fixes
Remove. again