clean up syntax, create one include file, fix minor errors related to syntax