little bit more cleanup and adding graph.psd