re-arranged a couple of items, nothing major