fixes and some room key verification