Comments and improvments