Various updates.
Applyed parches by KonstaT and Ravineti
Thanks to Kra1o5