comments an cleanup
fixed retrieve