Added 20 plus items, cleaned a bit