fix bugs and work on ML nodes