3.6/dev intrepid lwright

#482 
#515 
#490 
#494 
#498 
#516 
#536 
#535 
#485 

Remove commented out code