Adding CFBundleName for script
Fixing remaining bugs.