cleaning up page loading, adding location stuff