replaced container classes by STL vectors, commit 2