updated some files
updated core
fixed merge