4.1 update stuff and fixes