ws_fnc cleansup, marker cleanup & weather tweaks