updates to 3

well, I fucked this up badly, trying to save face here