One bug and two features implemented.