Updated ps plotting, generalized