tostring and assertvalid fix
working on cutting corners again... first corner cut!
quick cleanup (merging 2 files, using namespace std)