Added lots of stuff I got from Hank (thanks!)