Remove debug code.
Added some improvement and fixes.
annotation-empty fix.
First pass of annotations.