some educational && cosmetique changes. one bug fixed. 

You are welcome.