fixes to make things functional