more stuff working now