Minor tweaks and fixes. Need code for scheduling and constraint handling.