cleaner exception handling
remove stale todo
comment
makefile fix