Forgot to update targets in Makefile
Minor cleanup in the scripts
Merge branch 'master' of https://github.com/lrog/orcom