fix: bugs and slips