Fixed #24.
Fixed #25.
Fixed #23.
Fixed #22.