more fixes for atoms