Added functionalities and better makefile
Made makefile even better