Some more stuff done