Fixes made.
Further testing and correcting needed.