added new items and finished off a couple of things