Add scripts
Fix few bugs
Improve printing