fixed rake braindeadery / improved plotting