some small fixas