Comments and corrections :)