add missing stuff, switch to nib, & fix indents