some glue/fixes to make the very basics actually work