Hopefully now filling rooms properly. Few warnings leftover from debug