some first fixes