fixes & changes