fixes & deploy