I did a bunch of code standards cleanup, but I haven't actually tested this in quite a while.