[minor] Comment fixes, also @import shizzle