cleanup, bugfix, std::vector extension