Commented a lot of scripts
Fixed merge conflicts