more tweaks and updates. currying is fun. probably should be doing test cases instead of meaningless aesthetic tweaks.....