more bugfixes - yes I will rebase -i things