Moving around the comparison of dragcells vs prevdragcells

Also: inline some stuff