Usability additions to buccaneer.