Minor fixes and makefile added