cleanup and adding of the Open Shot eknight