Fix wrongly named attribute
Several fixes to get to a basic working state