Fixed basic issues, first runs now successful.