fixes and small changes