minor chanegs
fix makefile
minor changes