Made improvements suggested by Laurel.