Lists fixed, more debugging, finally committed again etc