Yeah, that's a good idea actually, with the Jedi being keepers of peace and since Padme hasn't heard of slavery in recent years should show that the federation's operations are secretive and distant.
When it comes to your edit, don't worry about it, take your time, mine will take quite a while and honestly I don't even know how long it's even going to end up being.