Updated with latest fixes/features