done. And made small improvements