fixed..... much things