added editing locations and fixed braindead deleting... still not the pretties code around but I have to make it work in a hurry..