minor imporovements