Added some indicators and improved makefile