additions/optimizations, add localization, include directive