summery fix, and some weird tabbing