fixes for some errors;
Merge branch 'master' of github.com:FiatInsight/ABS