Fixed stuff, added annotations.
Fixed stuff, added annotations