Various additions and edits

Signed-off-by: Matthew Ell <ell.matthew@gmail.com>