fixed rate period bugs and further reduced spam
merge fixed