More software tests, bugfix... etc