Kerri

Just some minor formatting suggestions, and one syntactical error I found in a lib/ file - I'll comment inline. Merge if you like :shaved_ice: