ironing out a few bugs