Some fixes and updates for me :)