cleanup
getting everything up to date