prophunt fixes

still a lot of todo