Minor changes proposed by Dustin