End of Evan Fix day

more fixes including fork movement