updated swe, fixed more functions