More improvements, reworked scenery into the thing.