solved some bugs... x) plenty more to correct