several fixes, looks like the commit before this was not pushed, refixed because no access to the other computer