Changes from 2nd round of reviews, thanks seanmonstar