more eception handling
I have no idea what I am doing
changed stuff