Bounds checking.
Add to map earlier.
Don't add start twice.