Fixed some bugs... but, couldn't fix 'em all...