some fixes and if you like take a look at the new f

take a look at the new file and tell me what do you think.