bug fixed, clean up and some other shit ^^