review fixes requested by lightsofapollo