use weeloader; some cleanup and fixes