fixes & new features