tidy up, missing import, rate tweak