Added feedback to cleanup, fixed bugs