Minor changes, runs on SF2 now