A lot of fixes
Added nicecode to makefile
Merge pull request #1 from bbpcr/fixes

Fixes