various changes, traps are now working