fixed some things with the room implementation, seems kind of ok now