fixed packages and tiny errors.