fix everything, closes #1