master now somewhat works again
small changes