Now it works! (Sort of...)
Minor changes.