Updates and fixes aplenty