fixing a couple of bugs, nearly works on both my machine, and a more exotic machine