Add makefile and cut lines
Random minor improvements