Major Update

Probably missed a few things