updates, still not quite where I'd like it