Some more optimization tweeks