Finally got around to doing the @ stuff for a bunch of things and fixed a bunch of missing names