bugifx
small changes