Some good changes / bug fixes!