Got more stuff working again