Ironing out bugs + refinement.