had some problems merging so it looks weird now .. will fix everything as soon as i can