Ironing out some bugs.