atoms fixes