Updated Core, worked on future setup a bit.