Finally fixed a bug that's been annoying me for the last week, now on to actually fixing the real bugs problems.