adding with-squashing, and fixing the todos