update from dev version, many changes