Fixed the includes and the bug in load (hope there is no more bugs like that)