Sure, you raise good points!

I'm also in doubt whether to put more work on it or leave it as it is.