last little dab of unstaticing.
minor renames and intellij warnings.