fixing some small issues

shutdown