Ok
Problem found (see TODO)
Minor changes
Solved some argument-order problems