bug fixes and reach target