Final updates for the night

Added a bunch more API and framework options, some last minute detail
changes. Good to submit.