fixing gen 1 bugs