3.2.2 - fixed small things