Minor reshuffle for consistency
Fixed broken build (derp). Removed some spurious parameters
Switched to nicer record updating syntax
Fixed bug with updating nick when not in a channel