Updated how locations are read. Should be super-accurate now.