fixing stuff i didnt do write before dan commits his breaktheworld commit