Merge with lionfish completed.

Many small adjustments
Minor fixes