Massive update

Made lots of changes