Fixing some untested lines... should get them tested.