Fixed some stuff for getting f started