merge nov 1 stuff #4

Closed sharaths21312 closed 4 weeks ago