Various stubs and minor edits.
Merge branch 'master' of github.com:pangyre/apv