Working a bit better; commit snapshot.
Another spapshot: played a cleaned a bit; now ready to merge some bigger changes.