minor cleanup, fis some data inconsistencies