Tomato draft 2, bugfixed mostly