Solving running bugs, updating templates files, improved source code