Fixed Several Errors with Stage 1