Some fixes, better edges