Removed the fast souping part - it was there just for testing purposes.
Made a few small changes.