fixed some bugs; improved watch mode; made template includes easier (paths are now relativ to the file that includes it)