more cutting, fixed makefile