package update support, error handling, reorganization