Add Location handling, style fixes