few fixes for readability while I rewrite some things