Improvements, fixed qulice on java8