renames n fixes n stuff oh my