Added targets
Added additional coordinate data
Minor variable tweaks.