So many tidbits. Fixing each of'em one by one