merge changes from banane, more fixes