bug fixes after merging in new captable
Merge branch 'links' into testing