Reformat annoations package to fit in margin. #165. Fix inconsistencies in default cache name