Fix some annotations

closes #7