wo normalize, various fixes.