fixes

speedtrap deleted
new functions