finished up some rough edges
Merge branch 'extcap' into testing