patches updated
Makefile adjustments
gitignore
sql related fixes