makefile tweaks
refactoring: rename
comments added and minor refactoring
travis fixes