Restrict note ranges
Fix note blocks