some fixes and forge method