changes to handling of almost everything