Minor changes, updated alignment