Testing and fixing some bugs.