changeWaitTime now supported. Some layout improvements.