Lots of bug fixes (almost working!), updated packages