*8800* More tweaks