Moved mk ws from foreach_user to prepare_ws
Other Fixes