second update and some small changes