More work on slack/float