Fixes & more settings