Misc. bugfixes - double sending should be gone