finalize some fiddeling