Lot's of improvements