bugs fixed-terry