General Cleanup

Made quite a few changes as I was reviewing the bundle for inclusion into the bundle installer. Got some complaints about the current Scala bundle we have which is very outdated, found yours when doing research into it. Will switch to yours once these changes are pulled in.