Some bugs were removed.