Improve location.add/sub, fix .simple

add/sub would require x,y,z rather than allowing locations
simple wouldn't handle worldless locations