Tiny changes throughout, check diff for info