bug fixes after merging in new captable