Many fixes thanks to Kulcsar Dalma.