#36 tweaks after testing