moar changes
bugfixing