minor improvements (not finished)