Added comments to head, cleaned up conf