fixing, exception silently. and some keys
too much right