fucking C++
various updates