Minor changes. Still haven't found the problem yet.