fixed annotations, documentation and visibilities