Converted 2012-04-22-oi-beibe-tsiigaa-tata-tykkii, and some additional fixes