fix config changes and more changes to makefile/readme