clean stuff up, make it work on linux smoothly again, and remove old cruft