#16, #17 WOW!!! Huge performance improvements!! And bug fixes