2 week fixed small errors