improvements, more testing