echronos: patch, fixes.  builds.