Added dimensional analysis, fixed minor things