Review and changes from Jocelyn Fiat

I guess this is only for testing, right?