Updated make file for more targets