Wow full of errors.. mistakes fixed and scripts improved :)