Core: Changed some things i messed up.