Add: Generate Id for each room, other minor improvements