Fixed most scripts and added package