minor fixes, modules update