Solved two things