Some fixes, some work in progress