updated properties, upped timeout, and other tweaks