Plenty of changes to usage and logger