Updated location retrieval for run fragment
Design pattern impl, bug fixes, tweaks