Reset Functions & Fixed Positions

Also cleaned up a small amount of code.