Started fixing errors

Some errors fixed, need to work on getCore functions, theyre returning
null sometimes