tested cycle, small fixes implemented in scripts and templates
tested cycle, small fixes implemented in scripts and templates