moar stupid bugfixes... its getting late... im past my commit threshold for the day...