Various amendmends and minor fixes.