Fixed bugs from last update

cleaned up duplicates, ambiguous combinations, bugs from last updates