Cleaned up source. All done. make all works now.