Fix initial data and couple errors