bugs fixed to run with forever