Setting rhythm properly and other tweaks
Merge branch 'drupal'