Updated several core things