Minor fix + additional scripts and code