Switched tabs to 8 spaces, updated modules