Fixed the bug where they get stuck.  Things seem to run smoothly but im
sure there will be problems found in th future.