Worked on TODO items; fixed bug in formatter specs