Few small changes, checkbox fix