fixed some markup issues
merged