minor changes to utilities
fixed merge conflicts