fixed makefiles to clean and build correctly.  Fixed errors.