Merge pull request #241 from sawilde/master

merge a number of changes
add some extra diagnostics when getting points failed