more fe and fixes