Updated to 1.6.4 and fixed many bugs