some more comments and improvments