more stuff working right