Revert "Sync to Master + fixed some stuff"

This reverts commit fe082f4ef7af1627ed08cc5de7188fdc625c2481.