minor bug fixes
Loading External Templates
working on Q