added default for just* fill, minor impros, wrap try-catch-blocks