made a few small changers to core classes, started writing up basic tests