Commits


various fixes


cope with new upas/fs


works


oops


Thanks to John Cummings.