Further adjustments, renaming and updates, still compiles, still does not run