Fixed comment tag parsing, some other minor fixes.