Making napkin math super powerful, various bug fixes