fix and remove artifacts