Fix minor bug and improve error messages
readd ttinclude files to samples