big cleanup and add some overlay