made time changes and several small design improvements