got rid of many warnings