updated modules, readded some lost commits