Updating with fixes from @dplumly