UI improvements. Small bug fixes. Next uup, NFC thingies..