fixed some positions and stuff