fixed all parsing