fixed sushi related bugs