edits to proxtrap
merger errors fixed