fixing things, adding some psclass flexibility