bug fixes
fscking return
fixed core lib