Smaller fixes, more testing