rename, minor fixes, Makefle updated