rig cleanup + 1st draft psd spaces