[FIXED] a lot of things