Some cleanup and bugfix in presentation. Results look somewhat encouraging