Traps finished and minor changes