added final tweaks