ffs

some fixes