clean up and additional LM issues.