Some improvements, I still have to test the setowner stuff, seemed a bit dangerous to give OP :3