put some more ferences and did some improvements