little bit of perfectionist tuning all around :P