More tweaks yaay