Production

Takes care of three simple bug requests.