various fixes and initial focal support