updated makefile and main

Fixed