Minor Makefile/gitignore tweaks. Small changes to return types