tweaks, updates, refactoring