fixing little bugs, moar tests