Further improvements to weeb mode