Universalizing and fixing resulting typos bugs and wrong logic ideas