Fixing some general problems like not having a stop button.  Not finished yet