Some fixes and styles for time saving.