Updated with latest fixes.