3.6/dev intrepid lwright

#614 
#615 
#616 
#580 
#584