fixed to working order.
cleanup