more stuff done, seems to work