more stuff works now