Work with COM-port added + minor improvements