Fixed #8 + extra things