Revert "Small Updates, Had errors, Had to save and revert"

This reverts commit b4edc4180a67ba2fc5e5f42cf5e75e57a7295c37.