cleaned up
added copy constructors for wrapper classes
updated strings