some disabled note fixes, and cleanup