general fixes & updates