Some Improvements in Design and Code