Ironing out some bugs