more ammtim improvements