te,p
some small bug fixes