Updated to Rev.420 and some's fix's