finished fixing errors introduced by bulk conversion