Moar imporvements