Moar improvments