clean ups and fixes