Lots and lots of bug fixes plus some more features!