more fixes to have it running