Added a small make file and some minor fixes