Testing and bug fixes in progress