Merged per styling and dev updates.