some fixes.. why try to change something that already works? ..s ..s.s. .s.