packaged and bug fixes