Many fixes

thats all i can do