some docs, and removed throwable leftovers
Merge remote-tracking branch 'origin/master'