some fixes & settings