Removed excess all: target
added new build targets.