Fixed some stuff, finished up user calcs on calculate.js