updated to latest version of all modules, inc do changes