code fixes, etc, all other scripts added