Added keyContexts and a few small bug fixes with placeholder