Fixed #4 and stuff