Bug fixes

The logic dead end is one I created myself. Some days you get the bear and some days...