More tweaks for apod