tied up some loose ends + testing