bug fizes
Merge https://github.com/ingridh/csuahack