small changes. will fix with Mick