Fixed circular dependency in Makefile
Updated strings