more fixes and small changes