Annotations and some stuff in the readme