Updates, and final fixes