Fix annotation styles and some errors