Fixes from prep
Add settings, move performance
clean