Fixed next label bug. Continuing function calling rewrite.