if you send a pull request with your fixes, i'll merge it