Some improvoments closer to compiling it.