some fixes lalala