Fixed Issues found in user feedback

If you are one of the folks that emailed me- your fix is in here.