moar structure improvements