Adding back standard annotation stubs
Fixing syntax of block comments