Lots of updates

Signed-off-by: Bowe Frankema <bowe@presscrew.com>