some basic structure/ides
improved Template
extended Template
bug fixes and performance improvements