Updates, cleanup and agignore