Just trying the new repository. Added a few fixes.