Add slightly problematic goto force thing
Fix goto force problem and rename some functions