various fixes
comments are prettier and better