cleaned up some loose ends..