Lots of improvements.  Fixed INCLUDE bug also.