tidied some stuff up, fixed problems where baselocation = location