0.2: lots of fix