Small fixes, started testing.