More changes, adopting changes of jgoal lib