Room generation improvements