updating everything. 

sending all my updates to main. thought it was done already....