Added wrapper classes & fixed bits.