fixed many bugz