updae framework (trunk version)

the trunk version improves things ^^