updating as I go and rem of uneeded files