Small changes, few bug fixes