just some new items and code cleaning