apply fixes and add a few modules