Fixed #4 and some other things.