hack together something like a fix
cleanup
some cleanup
string fix