fixed setup bugs
cleanup to fix missing view errors
pulled in inclusion processing fixes