Final changes to close out #156 and #153.