Changed some instance requirements

Also removed invalid TODOs and added other TODOs