A bit more stuff done