Continue fixing push support, cleanup comments