more Vec<T> and some cleanup