Annotation visibility added, bugs fixed