Scripts improved and added more scripts