added support of connect-to option; minor assets changes