error added, cleanups