Some pre-beta improvements

Here are some pre-beta release improvements, a couple dealing with better end of playlist handling.