Screenshot fixes, move some code around, fix some stuff