Clean things up a bit and add docs