Small corrections for s04, should be finished now