More silly fixes, and added in annotations for the sake of annotations.