Lots of fixes. Babyna tumba!