Correct some slight errors that were stopping the main class from loading.
Add undefined text constant
slight cleanup

More...