Updated templates and bugfixes
Updated readme