Good catch! Sorry about these commits, they're a bit all over the place, will clean them up tomorrow!