various changes
pulling from master
I'll be back...