Tweaks, updates, and dev dump