final updates for 3.5.4