Fixed teleport, polished scoring & wraparound
merged from dev