update edit companion, start fixing base entity fields