fixed warnings and new makefile