Fixed bugs, upgrade modules