Working on ol3 fixes, most are still a work in progress