Removed copying. Various minor edits.

Removed copying
Added check_location
Added comments