Made a few changes, cleaned up alignment issues.