fixing more buggy things