cleanup and few corrections