More or less ready for 4.1
More updates.