Convention and some fixes.