A couple of bugfixes and temporal compilation modifications.
The code is still unstable.