Some tweaks. + graphing function