fixes to adding assignments