Fixed trailing commas in handlers, added helpful comments to handlers. Slightly improved formatting.