replace @type Integer with @type Number
fix some annotations