building up pst_handler
some more tweaks to pst_handler