New year! +tweaks