bugfixing and moaar code.