some small refraction and fix