documentation, markers and moving wsp functions to private