Add todo, fixes based on nerves integration