Fixed more stuff, more features