Toolchain extended + minor fixes.