Setting rhythm properly and other tweaks