[Fix] Fixes #9 and a couple of other issues related to previous commits. :/