moved some stuff I missed that were gui related